refactored, site is more portable