Added for loop/switch statements