now to fix the offsets