added grand final + slight refactoring