Added 2 new helpers, working on adding a time based update