#168 Get rid of check thread, instead cover all cases that might need to update