added some more stuff v17