updated to use new property names