lots of changes
adf