fixed and commented for running on HDP