New init routine from #575