Added more quote stuff