closes #9555
refactored rara