APIE added Alessias changes. DRAFT 2 done.