Got rid of buggy Ajax