Updates

A bit of robust code and updating a wrong file commit.