added some more stuff