Added more to voltage calculator