P3, P16: Simplified solutions.