Made Alans changes