Solution PS2 updated