Added dealing with spaces for data generation oops