Lots of changes to the cross fold