lesson preview changed
merge