My r+ was based on this new code, so it's already good. :D