some updates after merge
final changes after merge