separated origin and target schemes, added RVK functionality