Updated to 1.2.3.Final