* refactored dataset (1st step)