renamed a few functions