Changes suggested in IRC