Updated motor code and added allows you to remove yourself without adding a number