non test version since the tests don't really work anyway