improve end-user experience

improve end-user experience