Major updates for finals