A slightly better solution