STATUS: Updated for upcoming 1.46