record store changes
fixing comments
responded to code review changes