Modifications to shorten demo time