P3 completed with all functionalities