Ajax notes
Minor merge conflict