Finish demo part 1