Redo of main take 2

This would be better I think