Updated w/ XML loading to decrease load time