main controller some changes reverted