More changes on story1 after revert of merge