PR/339: updates from Rick Richardson