Added substring calls
removed comment block
Update examples