more new changes to version 2