Worked on clearing data bug