Added a variant probably closer to the original goal...