Adding some changes for erc