refactored, fixed fn name issue, rebuilt
1.3.0