Fixed calculations to work and not spam alerts