Changed switch to 1 row code!