rolled in offline changes