took out some method calls