more changes, more final