switch cases added