Add conditional column design not pretty but works