* get rid of check_or_die() which is depricated
* use proper import