patch-1: recalling other stuff and keeping amd wrapper only (attempt #2 keeping indentations)