updates based on comment from jmcnamara #117