changes from Steve