APP under construction and optimisation