added further improvements
added further improvements
fixed a bug with DOP