UPdated version.
Fixed merge.