New version with everything removed and adding one piece at a time.