Better project type evaluation — #1, #2