MS: Smal changes