Added more mesurements and normalized PDF