added the changes as per required
added changes for data storage
removed unnecessary line.