update for ghpages, refactored version