Pulled changes from josh where we no longer user MEDIA/data