Changed some values + changed the function supCalc