Added final to a few function parameters