modified code all