More sensechecking code