setup the ajax
Merging with master