Feature/mw cross (#484)