modify somethings for better user experience