Finally, a version with some class