final changes, complete