Final version of 2.3 including tests