small changes in 2.2 and 3.1
florist changes