user handling added