initial conflict and capacity processing added...requires testing