Added Replacment of / to - for production