Completion of 2.3