Big changes in the project
Big changes to simplify