Procedure re-arranging