Updated to reflect current site state