Revert UDP, resolved in Amazon
Speed-up and separate log per machine
Adapt update for Amazon as well, need to speed up as well