clustercraf reintegrated and corrected