more merged changes and video illustration changes