better checks
better tests!