The integration of the code has some deficiencies which try to resolve here mainly to make reuse of the code easier. Also, the new valuator masks are now used by acceleartion, making things much more straightforward.