truth refactor... more