Changed modifiers to final