added carrierwave, model aqua