updated with the story so far