Additional changes from last meeting