inital functions added, add in the id or name check