working on correction for Main