safety checkin, rewrite still in progress