Refining Site a bit