Before demo changes (2h)