Hopefully improve performance in some situations