Update to what I have been using

This should make it simple.