Moving demos around and making small changes to a few