Re-ordered method for better readability
Added in order sync event fixes closes #747