Should i remove the other function then?