A slightly better solution.