add and clean up at end of AITPIEL