Updated to new location for 1.6