Yet more work on Pepper.