-FIXED- ai reworking