Changed video and organized code