Make it working on name kind of