more work on main