second changes, incomplete