Updated final class