modified fields and entire logic to store data