K ms branch

its ready to be merged