Some changes to how abbreviation works