AM 0527 rework

AM 0527 rework