some final changes
final