--more changes MISC-40