Updated version for the website to work