Slight tweak to ordering of parameters