Migrated from 1.6.2 to 1.6.4, just minor function name changes