incorporating the formal solutions from last year