re-added most offsets