updated and working version of the website