Updates/Revisions - added active timer