renamed a few methods to be more explicit