changes revert from master