latest changes from Adam.