Updates per Ariel's review