lots of changes, plus new directive for phone.