fixed multiple endpoints calculatie
Added new calculator