Updated final