remove m-4 and m-5, logic moved into m-1.