switch statement added