other versions

patch wouldn't  complete because of different code(other line numbers),working great