Manual update implemented
Merged with timer