Addressing concern of #44. Still need to test and verify changes work