from leptop - not the current code