Revert "Revert "AGM Items update""

This reverts commit f88dd90ecc1c2a1746654c73bbf77a1a3de68d99.