Fix P1 bug. Finish P3