major overhaul of media module