removed pull comment and added switch statement