#enh some logic is commented out