update to combined version