merge into decorator branch and added new Xover points branch