Redo first attempt at results architecture