has debug code to remove before release
removed debugging
v1.6.2 bug fix