Modified Jacob
Fixed mergeconflict