changed storage provider and programm logic