added some other stuff