Optimization

optimize the user experience