Added addressing dynamic singularities
Merge