Gemrc changes