Updated with work done over the last year