Some comments added
Added currentTime logic