changed/added stuff