modified code (naming conventions)