CLC-2012 Use else-if as suggested by Ray