updating comments
updating comments
tweaking the timings