updated ms based on comments from AE