Still fixing storyline