more changes to Main