Updated time algorithm and changed text