Cam fix and storyline redone