improve for auto schdule