Gross, removed comments, new mode to update