altered same data, did some refactor.