This approach looks much better.