put just name composition under if. 
put name and units setting to separate line