Update to make things a little bit shorter
Moar changes!