Change to allow for single apostrophes