Updated for r69