finish upgrade to 2.3