user handling improved