[CK] made the gem more autonomous