this is the version after adding webpages for client