integrate adam changes