Partial work on store