change to comply with strict rules
changed to work with Gantry