replaced the uuid's in the form with variable names from the macro