Adding some fancy stuff