Final demo updates