added switch statements and png