kirillov bugs first etap
kirillov bugs second etap
kirillov bugs fixed