Added more check stuff