renamed a couple of functions