merging fixed, evaluation fixed, dobf notifications added