solved some folly issues