Updated combined script