Updating as of MS comments