Upgraded with latest Ratchet