use conditonal expressions and do another name change