some cleaning and ?update=true