A bit better

Closes #1