Started to fix mass updates