Changed method names according to guidelines