Fixed CS + changed switch to shorthand