cleaned main again