Code changes for v 1.2.3