sameeras change and p2 fixes