MO-332 implemented and tested