Simplify ComputeFeature
Merge with ercool
Merge with Paul