More date changes and messing with quotes...