Debugged more data formating.