updated to working media manager
merge fix