Changed some member functions.