initial changes to combination logic