just changed some calculations