Addressing parts of #25