adding changes for on set