Finished M6 functionality