Upgraded to new install method