updated for m-7

still need to update calculations file
m-7 stuff