some more changes to make the code in correlation with the web pages.