Patched for new code base in Origin