Updated to work with latest code. REOL-74