ordering (if-else)
Ordering more elegant; Add highlite