Including key changes from #3