Addresses #1 and #2