SITE-COMPLETE except for minor changes