Final changes

final changes