Made Toms changes