Changed method names to match changes