Add clear data, and bug fixing