Added notes from Johnty about changes needed for MS.