Working version before supernode