some new changes from Anton