more of MK's changes
removed duplication