Comment all this out until we find the problem