changed to switch