Some changes + commenting out AJAX