Fix/fullstory

@amillet89 @ndhoule @harrietgrace can you merge this one in?