Finalizing the first cut after demo