Updated for A-MQ 6.1
Updated for 6.1