Antirez initial (updated) patch