fixed up initial main