added combined version