changed naming to be better