Updated install routine