Added video and some flow changes