integrating ratchet bundle
some fixing from sensiolabs insigth