Implementing APPM-23