Refactor R13-R18