some more stuff changed