check names is in
removed the TODO item which was done