added more scaffolding for CPS