updated json. Need to add rule parser for combination upgrade
refactoring and simple combination upgrades