R_MODE fixing WIP