added some fancy stuff;