Little redesign of whole mechanism; added new boxes; cleaning