Updated with Ariel's suggestions