New Version - Fixed Clean Data Issue