creating, deleting now work for multiple machines