Change static to datastories