Added constsants and logic for Watch and ensure get time on start