final changes

final changes implemented