updated switch to handle the different path set earlier