Minor modification. Still needs scripts