GEN-173 #Resolve adam