Removed all unneccessary delays