Updated for 3.16 and HP14