Started working on main with Ali