Work on PM to send correct response when demo'd