Solution updated with project