New version of Stephan's protocol, should be working now.