Updated to include auto installer