Slight improvement of taoDelivery template