Changed some methods to eliminate superfluous methods.