optimization + new files for JointADF