getting rid of deprecated couple_type_old. Minor changes