IT IS MORE BETTERER (v2)

See commit message for details