Enhance cleaning process; now able to build twice in a row