modified user.m