working on new main