Should now work on distributed systems