Addes check while creating combination. misc changes