last changes from chris