Adding in Christina's changes as well as a wuick change to ajax.js