Added data recorder, changed naming scheme