Updated the code not to move away from config.url