added some fancy