Major update adding changes from last year