Brian's Joraph enhancements