resolve p1 issues