second half of #11