related to #267 improved demo products