Changed to media controller to help syncing