Design + poo update