ME: removed ternary operator