Updates Updates Updates

As worked with Francioni on 5/5