final changes

working