adding suggested changes to fulfill refs #20