added ternaries