Updated to fit new mechanical designs