removed quantization and simplification