MK's small changes
solving a one line conflict