added if-then-else and conditionnals