backup of original version
Upgraded to use new style accessors and code practices