small changes...function renaming