Stage of upgrade

by Ruslan Kholyaev (Fullvector)