Added new version that follows correct states