Case stmt added