Mater Step 7.3.2 : Done. Seems to be properly working for switch construct now.