New and improved set-up....quite happy with it now