Updated with the latest files and changes from the ats project