Attempted to fix storage problem
Added more to this