final changes on the physics part done