Some polishing done for 2.2