WIP updates for May 6