friday work, 2nd draft of Msun=1