M503 implemented (tis time with added bug-free-ness...)