Modify media code
Fix merge