calculating unit types properly now.