Some backstage modifications...