This approach is hopefully better.