renamed a few variables