Added user method, some fix