WIP: Combined two dicts into single dict. Simplified the condition checks.