refs #23 changes should be as desired