FIX: problems from merging so many updates