commit_rbukharov

optimizations