added jack's change