Updated comfy