MERGE ALGO FIRST! Update timer