Added scale factors and modified water analysis