updated all deployments to include conditional logic