Cleaned up basic_check patch