Changes made with Andy's guidance (he was here)