changes from 2