Add copy option for media
Improve by-hand
Merge branch 'media'