renamed a couple methods