story1_2
story1 fixes