adding switch stmts