Update for version 2.3