Implements demo and final adjustments