Made some changes with method names