revert changes and add just missing media stuff