Integrating .story files with fixes