updated to reflect live hotfixes I couldn't do locally