Added some fancy stuff