Update to new install routine