p3 - updates and optimizations