Real update to R7 (Hopefully)