Mike refactor on r1::list