v33, removed debugging code should be bug free now