Updated to code based on 1.2.14