Updated, added factor
Still issues with intRad, left a comment on issue