Further work to APP