Adjust functions order