inprove to 7:28 in movie
refactor entire of change introduced in video