Minor modifications
Changed name