Merged the changes to address and deleted all the delays