changed some calculations