edited reject_if, but commented out for now