Update to F2 2-7-3 and updated ORBATs