Moved some quotes into customer validation