refactored for gh-pages