just make it work with new user