fix and debug Data2