added some changes on main