Initial Storage Fix