Using the function for safety
Bad comment
Now loads control changes for #19