Progress on sanity check