revised everything
final for 6.1