Improve a bit the project