move to server based raven + som tweaks