update for better user experience