Further work on issues #3, #4 & #5