Changed order of installation to fix dependency error when performing a new installation