Implementing AJAX fix (attempt)