* just updated the basics in order to fit with the new project