Last part of MKWS-58 (apart from documentation)