Updated Time parameter & added comments