Modified Data.h