working changes from tdt4