added some fancy stuff