updated to reflect v1.4 changes