Add back ajax start and stop till I have a better solution