Removed strtok dependency. Testing pending.