Final demo preparation