working on main system