Added just a few things :P