Trying to convince myself that this is an improvement.