Added @bruce-alderson's recent changes