added ternary
final committ