Implemented the surrogate clause idea

Seems to work nice (but quite slow)