Updated code for v1.2.6