Pre update for use of soluble flexstore
updated