some changes
Merging both websites