fix calculation, add parser for yuma