EXPE: EXPE02 refactored