others revised and tests work