attempting to merge my 1.7-friendly updates