More progress towards offline