Removing substring call as requested by Sam Roberts.