Tweaking to suit staging