Awake to cleaner and less buggy EoMa version