updates to main2