final update

work in progress