more changes from dave