Edit and AJAX added