Variable names change
Added ppm and float support