Updates to include better cleaning and functionality