Working on reworking AOI