Refactored to use python-single-r1