fixed calculation and suite classes