P0.W2.C9 adding more changes