added enables, to be tested on Yntes system