Moved to a member-test approach