Another version with #6 added