Update from Negative-Network fork