tweaks input variables order
Perpare 0.4.0