changing convention to use Record