Added new implementation of website