preparing for 2.3 update