added some cool features