fix the offset manager later