Slightly reworked Make_Proc
More procedure reworking