Slightly more use of common code