merge check_core into staging before I work on it