Latest raven changes