cleaned up and add media