working on m017, buggy