#169 last commit before "snapshot engine"