Simplefied the project.