Good to see this complex method disappear in favor of specialized library...