reworked structure freeze time to interact with setState
Merge remote-tracking branch 'origin/master'