incremental changes to Nikolaev