More work on #4 & #5