Updated Project with a little of 3 of 5