updates based on review from jmcnamara