added data part, data cleanup