Ww2.5.1.3

Adding my commits to Peter's