Modifying code to work with V1.6.