Updated AE2 and ExtraCells2