First try at version 2.