added stuff, seems important