all issues added
merge with video