Addresses Kati's requests: #256 and #257