Add apostrophes
Better logic