started working on the main again