Trying to handle things better.