Start of using only expressions
Fixed solution, with expressions this time