Updated solution with "extra" items.