Added 'if ... then ... else' again