Added changes discussed with @jasongrout