Changes from tciket 123