Same as previous, but handle abbreviations