It was bad idea. Returned to prev state with some minor changes