improve offline
improve offline