Added better use of site wide variables.