Made changes to ease it on multi users