written TODOs in P-S-Demo