Updated working copy. Need to test.