Added a lot of this->