added some changes to static-pages branch