Added Nikolay's changes that wouldn't push to the server.