Attempt to improve performance