Activity 2.1.5 AOI Logic Implementation