Rebuilt ratchet to reflect last changes