Adjusted to work with changed data script