Seems to be working well, a couple of tests are in order