Updated methods with final for speed improvements