Raven II codebase, newer version