Added if then else according to 3.1.4