changed so everything is from p1 folder