improved single mode contract, no block moving necessary any more.