add integrator support, reorder arguments