commented back before_delivery