cganged version to 0.6.4