Changed constants to get a workable model, refractored