Changed a few method names and updated Classic