added some nice stuff