This commit works without foldstates