Updates to adhere to #1