added timeout and stories error fix