adding pi 1 patches
merged conflicts