Further work on #3 and #5