merged simons changes