updated for r8e