Changed some factors to numerics