fake timer
esther -final changes
Merge remote-tracking branch 'origin/master'