Final version. Fix populator and AMW bug