changed naming slightly