Fixes. Complete AEPS