merging
fixing problems with SimpleIdentifier