Refreshed 2.2.1 code