some changes / modified init / store / load methods