Addressing some of the issues in #61