Added more finals where needed