balanced the timeupdating and constant needs
Merge branch 'Dev' into constants