this addresses #7, #11