First step in fixing CUSTOM
Second step in updating CUSTOM