Updated to handle new tabun and stories