Time remaining functionality added