Update using hints from @rmcgibbo