Changed 30 mins to 40