added carrierwave back in