Removed the keepuptodate stuff because its a bit slow