Removed old classe + changed type of conditionalExpression