More edge cases
New compiled version