Changed couple variable & method names, etc …